From c26940a7447571c37580ada1702595c022d2d1da Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 20 Jan 2020 12:46:13 +0100 Subject: [PATCH] VT-d: adjust log messages in domain_context_mapping_one() Add missing newlines, use %pd, and drop exclamation marks. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index c56df8e58e..fbf60f08fe 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1308,10 +1308,9 @@ int domain_context_mapping_one( if ( pdev->domain != domain ) { printk(XENLOG_G_INFO VTDPREFIX - "d%d: %04x:%02x:%02x.%u owned by d%d!", - domain->domain_id, - seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - pdev->domain ? pdev->domain->domain_id : -1); + "%pd: %04x:%02x:%02x.%u owned by %pd\n", + domain, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + pdev->domain); res = -EINVAL; } } @@ -1323,16 +1322,15 @@ int domain_context_mapping_one( if ( cdomain < 0 ) { printk(XENLOG_G_WARNING VTDPREFIX - "d%d: %04x:%02x:%02x.%u mapped, but can't find owner!\n", - domain->domain_id, - seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + "%pd: %04x:%02x:%02x.%u mapped, but can't find owner\n", + domain, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); res = -EINVAL; } else if ( cdomain != domain->domain_id ) { printk(XENLOG_G_INFO VTDPREFIX - "d%d: %04x:%02x:%02x.%u already mapped to d%d!", - domain->domain_id, + "%pd: %04x:%02x:%02x.%u already mapped to d%d\n", + domain, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), cdomain); res = -EINVAL; -- 2.30.2